From: lvoegl <lvoegl@tdt.de>
Date: Tue, 31 Aug 2021 11:51:06 +0000 (+0200)
Subject: luci-app-wireguard: merge app and proto rpcd
X-Git-Url: http://git.openwrt.org/%22https:/collectd.org/%22http:/www.crowdsec.net//%22https%22/%22https:/collectd.org/%22http:/www.crowdsec.net/%22https%22?a=commitdiff_plain;h=d98935c45b7affde6b5323d87473ea82736a1335;p=project%2Fluci.git

luci-app-wireguard: merge app and proto rpcd

Signed-off-by: lvoegl <lvoegl@tdt.de>
---

diff --git a/applications/luci-app-wireguard/Makefile b/applications/luci-app-wireguard/Makefile
index ee260a982a..fe6a2c66ef 100644
--- a/applications/luci-app-wireguard/Makefile
+++ b/applications/luci-app-wireguard/Makefile
@@ -7,7 +7,7 @@
 include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=WireGuard Status
-LUCI_DEPENDS:=+wireguard-tools +luci-proto-wireguard
+LUCI_DEPENDS:=+wireguard-tools
 LUCI_PKGARCH:=all
 
 include ../../luci.mk
diff --git a/applications/luci-app-wireguard/htdocs/luci-static/resources/view/wireguard/status.js b/applications/luci-app-wireguard/htdocs/luci-static/resources/view/wireguard/status.js
index ca4ca9fd17..8614db018e 100644
--- a/applications/luci-app-wireguard/htdocs/luci-static/resources/view/wireguard/status.js
+++ b/applications/luci-app-wireguard/htdocs/luci-static/resources/view/wireguard/status.js
@@ -6,7 +6,7 @@
 
 
 var callGetWgInstances = rpc.declare({
-	object: 'luci.wireguard_status',
+	object: 'luci.wireguard',
 	method: 'getWgInstances'
 });
 
diff --git a/applications/luci-app-wireguard/root/usr/libexec/rpcd/luci.wireguard b/applications/luci-app-wireguard/root/usr/libexec/rpcd/luci.wireguard
new file mode 100644
index 0000000000..7354ad4922
--- /dev/null
+++ b/applications/luci-app-wireguard/root/usr/libexec/rpcd/luci.wireguard
@@ -0,0 +1,146 @@
+#!/usr/bin/env lua
+
+local json = require "luci.jsonc"
+local sys = require "luci.sys"
+local io = require "io"
+local uci = require "uci"
+
+local methods = {
+	generateKeyPair = {
+		call = function()
+			local prv = sys.exec("wg genkey 2>/dev/null"):sub(1, -2)
+			local pub = sys.exec("echo '" .. prv .. "' | wg pubkey 2>/dev/null"):sub(1, -2)
+
+			return {keys = {priv = prv, pub = pub}}
+		end
+	},
+	getWgInstances = {
+		call = function()
+			local data = {}
+			local last_device = ""
+			local qr_pubkey = {}
+
+			local wg_dump = io.popen("wg show all dump 2>/dev/null")
+			if wg_dump then
+				local line
+				for line in wg_dump:lines() do
+					local line = string.split(line, "\t")
+					if not (last_device == line[1]) then
+						last_device = line[1]
+						data[line[1]] = {
+							name = line[1],
+							public_key = line[3],
+							listen_port = line[4],
+							fwmark = line[5],
+							peers = {}
+						}
+						if not line[3] or line[3] == "" or line[3] == "(none)" then
+							qr_pubkey[line[1]] = ""
+						else
+							qr_pubkey[line[1]] = "PublicKey = " .. line[3]
+						end
+					else
+						local peer_name
+						local cur = uci.cursor()
+
+						cur:foreach(
+							"network",
+							"wireguard_" .. line[1],
+							function(s)
+								if s.public_key == line[2] then
+									peer_name = s.description
+								end
+							end
+						)
+
+						table.insert(
+							data[line[1]].peers,
+							{
+								name = peer_name,
+								public_key = line[2],
+								endpoint = line[4],
+								allowed_ips = {},
+								latest_handshake = line[6],
+								transfer_rx = line[7],
+								transfer_tx = line[8],
+								persistent_keepalive = line[9]
+							}
+						)
+
+						if not (line[4] == "(none)") then
+							local ipkey, ipvalue
+							for ipkey, ipvalue in pairs(string.split(line[5], ",")) do
+								if #ipvalue > 0 then
+									table.insert(data[line[1]].peers[peer_name]["allowed_ips"], ipvalue)
+								end
+							end
+						end
+					end
+				end
+			end
+
+			return data
+		end
+	}
+}
+
+local function parseInput()
+	local parse = json.new()
+	local done, err
+
+	while true do
+		local chunk = io.read(4096)
+		if not chunk then
+			break
+		elseif not done and not err then
+			done, err = parse:parse(chunk)
+		end
+	end
+
+	if not done then
+		print(json.stringify({error = err or "Incomplete input"}))
+		os.exit(1)
+	end
+
+	return parse:get()
+end
+
+local function validateArgs(func, uargs)
+	local method = methods[func]
+	if not method then
+		print(json.stringify({error = "Method not found"}))
+		os.exit(1)
+	end
+
+	if type(uargs) ~= "table" then
+		print(json.stringify({error = "Invalid arguments"}))
+		os.exit(1)
+	end
+
+	uargs.ubus_rpc_session = nil
+
+	local k, v
+	local margs = method.args or {}
+	for k, v in pairs(uargs) do
+		if margs[k] == nil or (v ~= nil and type(v) ~= type(margs[k])) then
+			print(json.stringify({error = "Invalid arguments"}))
+			os.exit(1)
+		end
+	end
+
+	return method
+end
+
+if arg[1] == "list" then
+	local _, method, rv = nil, nil, {}
+	for _, method in pairs(methods) do
+		rv[_] = method.args or {}
+	end
+	print((json.stringify(rv):gsub(":%[%]", ":{}")))
+elseif arg[1] == "call" then
+	local args = parseInput()
+	local method = validateArgs(arg[2], args)
+	local result, code = method.call(args)
+	print((json.stringify(result):gsub("^%[%]$", "{}")))
+	os.exit(code or 0)
+end
diff --git a/applications/luci-app-wireguard/root/usr/libexec/rpcd/luci.wireguard_status b/applications/luci-app-wireguard/root/usr/libexec/rpcd/luci.wireguard_status
deleted file mode 100644
index 892e74dbf1..0000000000
--- a/applications/luci-app-wireguard/root/usr/libexec/rpcd/luci.wireguard_status
+++ /dev/null
@@ -1,138 +0,0 @@
-#!/usr/bin/env lua
-
-local json = require "luci.jsonc"
-local sys = require "luci.sys"
-local io = require "io"
-local uci = require "uci"
-
-local methods = {
-	getWgInstances = {
-		call = function()
-			local data = {}
-			local last_device = ""
-			local qr_pubkey = {}
-
-			local wg_dump = io.popen("wg show all dump 2>/dev/null")
-			if wg_dump then
-				local line
-				for line in wg_dump:lines() do
-					local line = string.split(line, "\t")
-					if not (last_device == line[1]) then
-						last_device = line[1]
-						data[line[1]] = {
-							name = line[1],
-							public_key = line[3],
-							listen_port = line[4],
-							fwmark = line[5],
-							peers = {}
-						}
-						if not line[3] or line[3] == "" or line[3] == "(none)" then
-							qr_pubkey[line[1]] = ""
-						else
-							qr_pubkey[line[1]] = "PublicKey = " .. line[3]
-						end
-					else
-						local peer_name
-						local cur = uci.cursor()
-
-						cur:foreach(
-							"network",
-							"wireguard_" .. line[1],
-							function(s)
-								if s.public_key == line[2] then
-									peer_name = s.description
-								end
-							end
-						)
-
-						table.insert(
-							data[line[1]].peers,
-							{
-								name = peer_name,
-								public_key = line[2],
-								endpoint = line[4],
-								allowed_ips = {},
-								latest_handshake = line[6],
-								transfer_rx = line[7],
-								transfer_tx = line[8],
-								persistent_keepalive = line[9]
-							}
-						)
-
-						if not (line[4] == "(none)") then
-							local ipkey, ipvalue
-							for ipkey, ipvalue in pairs(string.split(line[5], ",")) do
-								if #ipvalue > 0 then
-									table.insert(data[line[1]].peers[peer_name]["allowed_ips"], ipvalue)
-								end
-							end
-						end
-					end
-				end
-			end
-
-			return data
-		end
-	}
-}
-
-local function parseInput()
-	local parse = json.new()
-	local done, err
-
-	while true do
-		local chunk = io.read(4096)
-		if not chunk then
-			break
-		elseif not done and not err then
-			done, err = parse:parse(chunk)
-		end
-	end
-
-	if not done then
-		print(json.stringify({error = err or "Incomplete input"}))
-		os.exit(1)
-	end
-
-	return parse:get()
-end
-
-local function validateArgs(func, uargs)
-	local method = methods[func]
-	if not method then
-		print(json.stringify({error = "Method not found"}))
-		os.exit(1)
-	end
-
-	if type(uargs) ~= "table" then
-		print(json.stringify({error = "Invalid arguments"}))
-		os.exit(1)
-	end
-
-	uargs.ubus_rpc_session = nil
-
-	local k, v
-	local margs = method.args or {}
-	for k, v in pairs(uargs) do
-		if margs[k] == nil or (v ~= nil and type(v) ~= type(margs[k])) then
-			print(json.stringify({error = "Invalid arguments"}))
-			os.exit(1)
-		end
-	end
-
-	return method
-end
-
-if arg[1] == "list" then
-	local _, method, rv = nil, nil, {}
-	for _, method in pairs(methods) do
-		rv[_] = method.args or {}
-	end
-	print((json.stringify(rv):gsub(":%[%]", ":{}")))
-elseif arg[1] == "call" then
-	local args = parseInput()
-	local method = validateArgs(arg[2], args)
-	local result, code = method.call(args)
-	print((json.stringify(result):gsub("^%[%]$", "{}")))
-	os.exit(code or 0)
-end
diff --git a/applications/luci-app-wireguard/root/usr/share/rpcd/acl.d/luci-app-wireguard.json b/applications/luci-app-wireguard/root/usr/share/rpcd/acl.d/luci-app-wireguard.json
index f0938e5b00..cd38bcf8ec 100644
--- a/applications/luci-app-wireguard/root/usr/share/rpcd/acl.d/luci-app-wireguard.json
+++ b/applications/luci-app-wireguard/root/usr/share/rpcd/acl.d/luci-app-wireguard.json
@@ -3,7 +3,7 @@
 		"description": "Grant access to LuCI app wireguard",
 		"read": {
 			"ubus": {
-				"luci.wireguard_status": [
+				"luci.wireguard": [
 					"getWgInstances"
 				]
 			}
diff --git a/protocols/luci-proto-wireguard/Makefile b/protocols/luci-proto-wireguard/Makefile
index f88b90bbfa..45ec1921cc 100644
--- a/protocols/luci-proto-wireguard/Makefile
+++ b/protocols/luci-proto-wireguard/Makefile
@@ -7,7 +7,7 @@
 include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=Support for WireGuard VPN
-LUCI_DEPENDS:=+wireguard-tools
+LUCI_DEPENDS:=+wireguard-tools +luci-app-wireguard
 LUCI_PKGARCH:=all
 
 include ../../luci.mk
diff --git a/protocols/luci-proto-wireguard/root/usr/libexec/rpcd/luci.wireguard b/protocols/luci-proto-wireguard/root/usr/libexec/rpcd/luci.wireguard
deleted file mode 100755
index a6c951f3de..0000000000
--- a/protocols/luci-proto-wireguard/root/usr/libexec/rpcd/luci.wireguard
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-. /usr/share/libubox/jshn.sh
-
-case "$1" in
-	list)
-		json_init
-		json_add_object "generateKeyPair"
-		json_close_object
-		json_dump
-	;;
-	call)
-		case "$2" in
-			generateKeyPair)
-				prv=$(wg genkey)
-				pub=$(echo $prv | wg pubkey)
-				json_init
-				json_add_object "keys"
-				json_add_string "priv" "$prv"
-				json_add_string "pub" "$pub"
-				json_close_object
-				json_dump
-			;;
-		esac
-	;;
-esac